small bug fixes
Merge pull request #20 from baambooli/TA-15

small bug fixes