Merge pull request #16 from MilkyWayJoe/master

PR for Issue #15