Dev

Solves issue #488