Merge pull request #5 from S3b0/master

Merge branch 'dev_2.0'
Merge pull request #6 from S3b0/dev_2.0

Merge pull request #5 from S3b0/master