Pull Request from erasmussen2/develop

#443, #448, #451, #452