Merge pull request #5 from pfalcon/4upstream

Few fixes and improvements for reliability/usability