Merge pull request #16 from lformella/master