work done 10/10/13
Fix for #132, #135
Merge remote-tracking branch 'upstream/master'
Merge pull request #157 from LisaHelm/master

Fix #145, add #132, #135