update and cleanup
Merge pull request #41 from fbergkemper/master

update and cleanup