Thanks for your comment. Last commit contains your recommended changes.