Merge pull request #30 from N-Pex/paik

Latest from master