Fixed bug 2653
Merge pull request #109 from goehle/devupdates

Fixed bug 2653