4-3-2014 1614

working i guess
Merge remote-tracking branch 'upstream/master'
Merge pull request #19 from DevenSmith/master

4-3-2014 1616