12/3/14_2
Merge pull request #15 from K-McK/master

12/3/14_2