Merge pull request #8 from arjun1985/master

Fortify more
fixed transferring degenerate cases