update based on few of my bookmarks
Merge pull request #14 from andrzejsliwa/master

update based on few of my bookmarks