portability
Merge pull request #1 from DpEpsilon/master

Portability issues resolved