Finishing up
Merge pull request