First commit - Almost ready for release \o/