Dev branch

closes #48 
also fixes some of #47