First draft of working version for upcomming release 0.1.0