updating again
Merge pull request #18 from mcwic/master

updating again