Merge pull request #16 from andrzejsliwa/master

next update based on my bookmarks
Merge pull request #17 from andrzejsliwa/master

small update... sorry for lots of updates, digging in my archive :)