Merge pull request #18 from DevenSmith/master

4-3-2014 1505
Merge remote-tracking branch 'upstream/master'