Merge pull request #13 from ffrensch/master

changes made by rebecca
fixes - working, but clean up has to follow
Merge remote-tracking branch 'upstream/master'