Pr36

Includes changes from #36 and did some more changes (reordering of layout, added dev list)