12/6/14
Merge pull request #17 from K-McK/master

12/6/14