Fixed switft
Merge pull request #113 from isflorin/dev

Fixed switft