Merge pull request #97 from jwendl/master

Several bug fixes and layout fixes.
Merge pull request #28 from Magenic/master

Merge pull request #97 from jwendl/master