Remainder of the proposed changes. 

Tks.
Remainder of the proposed changes. 

Tks.
Remainder of the proposed changes.
Merge pull request #2 from wryel/master

Remainder of the proposed changes