10-18 merge
Merge pull request #56 from alexsimon1234/master

10-18 merge