Merge pull request #56 from N-Pex/paik

Latest from master