Merge pull request #18 from ScrambledEgge101/master

End of Day March 13, 2014