-Fixed #26; examples updated accordingly
-Progress on #22
-Some cleanup in Phase