Merge pull request #6 from c410echo/master

Merged from master
Added functions
Merge pull request #74 from Hmturner/master

Summary of 10-23-14 11:56 changes