Merge pull request #8 from bohacekp/poetter

Bohacek: Fixed the issues that we talked about on May 2 meeting.