Fixed branch
Merge pull request #1 from infinitetoken/fixed

Fixed branch