First Commit
Change function names
Merge pull request #24 from pcl322/master

Second time