update
Merge pull request #211 from kajdus/devel

update