Merge pull request #6 from menatwork/dev

Update master
Fix issue #7
Fixed brocken DCA