Merge pull request #34 from N-Pex/paik

Latest from master