Merge pull request #139 from adamarla/master

Phssss.. no need to count subparts!
fixed map to go over num of pages
Merge remote-tracking branch 'upstream/master'