Merge pull request #218 from berni155/master