Initial Commit
Merge branch 'kasun' of github.com:tmkasun/port
Dinuka's modifications