Merge pull request #270 from udp3f/master

some fixes