Merge pull request #53 from N-Pex/paik

Merge from master