Dev merge v0.1

Working base version 0.1