Early January 2013
Merge pull request #5 from shwayd/master

Early January Edits