finished
Merge pull request #6 from mcwic/master

finished