Merge pull request #59 from N-Pex/paik

Latest from master