Issue#429

resolves #429
resolves #45 - yay!