fixes - working, but clean up has to follow
Merge remote-tracking branch 'upstream/master'
Merge pull request #14 from ffrensch/master