Merge pull request #34 from kaimi/lpt2013.2-gp006