mikeizbicki Merge pull request #79 from feuerbach/master