Merge from @hpeide 's awesomework