Closes #470

@allspiritseve Ready for review!