Update and clean up
Merge pull request #2 from haga/working

Update and clean up