update 5/24/14
Merge pull request #5 from dev100/patch-3

update 5/24/14