bshyong merge PR #20 by Pomyk