improvements
Merge pull request #5 from DF1E/dev

improvements