tapio Merge pull request #8 from triplepointfive/boundary_fix