part 1
part2
Merge pull request #41 from cpasmoi/master

cleanup