Moved some code...

Related to Issue #51