done
Merge pull request #17 from rkophs/cleanup2

done