Closes #405 and #414. Viewport Issue corrected. (thanks to Arun)