Merge pull request #2 from IanJRigg/master

pulling the update
Merge pull request #5 from candaya/candaya

Merge pull request #2 from IanJRigg/master