Merge pull request #5 from S3b0/master

Merge branch 'dev_2.0'